Explicitly use the svg loader, if available. This should help with the

2005-07-20  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkicontheme.c (load_svg_at_size): Explicitly use the
	svg loader, if available. This should help with the fact that
	svg is not reliably sniffable with the current gdk-pixbuf sniffing
	code.

diff --git a/ChangeLog b/ChangeLog
index a2d9804ba23b7f27b146ca9951ee9b421568e750..363cba72b46cbba5acbefdedec8dd6b9d0ca105f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-07-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkicontheme.c (load_svg_at_size): Explicitly use the 
+       svg loader, if available. This should help with the fact that
+       svg is not reliably sniffable with the current gdk-pixbuf sniffing
+       code. 
+
        * gtk/gtkstyle.c (gtk_default_draw_expander): Make sure expanded
        expanders are not fuzzy.  (#310172, reported by Alexander Larsson,
        patch by Owen Taylor)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a2d9804ba23b7f27b146ca9951ee9b421568e750..363cba72b46cbba5acbefdedec8dd6b9d0ca105f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2005-07-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkicontheme.c (load_svg_at_size): Explicitly use the 
+       svg loader, if available. This should help with the fact that
+       svg is not reliably sniffable with the current gdk-pixbuf sniffing
+       code. 
+
        * gtk/gtkstyle.c (gtk_default_draw_expander): Make sure expanded
        expanders are not fuzzy.  (#310172, reported by Alexander Larsson,
        patch by Owen Taylor)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a2d9804ba23b7f27b146ca9951ee9b421568e750..363cba72b46cbba5acbefdedec8dd6b9d0ca105f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2005-07-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkicontheme.c (load_svg_at_size): Explicitly use the 
+       svg loader, if available. This should help with the fact that
+       svg is not reliably sniffable with the current gdk-pixbuf sniffing
+       code. 
+
        * gtk/gtkstyle.c (gtk_default_draw_expander): Make sure expanded
        expanders are not fuzzy.  (#310172, reported by Alexander Larsson,
        patch by Owen Taylor)

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 97cf4f9c57ef6c609f880698474cdc5e0ecc6640..8e36998fde99703de56eea6d4363b82aece47c53 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -2371,7 +2371,10 @@ load_svg_at_size (const gchar *filename,
                            &contents, &length, error))
     goto bail;
   
-  loader = gdk_pixbuf_loader_new ();
+  loader = gdk_pixbuf_loader_new_with_type ("svg", error);
+  if (loader == NULL)
+    goto bail;
+
   gdk_pixbuf_loader_set_size (loader, size, size);
   
   if (!gdk_pixbuf_loader_write (loader, contents, length, error))